Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <[email protected]>
Fri, 25 Apr 2008 22:06:13 +0000 (00:06 +0200)
committerWolfgang Denk <[email protected]>
Fri, 25 Apr 2008 22:06:13 +0000 (00:06 +0200)

Trivial merge